From: Joakim Verona Date: Mon, 19 Aug 2013 06:01:26 +0000 (+0200) Subject: merge from trunk X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=e86a500d430c41e7fd8c7412c3a638154186b83b;p=emacs.git merge from trunk --- e86a500d430c41e7fd8c7412c3a638154186b83b